Remove GtkThemingEngine
authorTimm Bäder <mail@baedert.org>
Wed, 5 Oct 2016 18:26:08 +0000 (20:26 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 16 Oct 2016 16:17:21 +0000 (18:17 +0200)
As well as the corresponding GtkCssEngineValue used to parse it in css.

25 files changed:
docs/reference/gtk/gtk4-sections.txt
gtk/Makefile.am
gtk/deprecated/Makefile.inc
gtk/deprecated/gtkstyleproperties.c
gtk/deprecated/gtkthemingengine.c [deleted file]
gtk/deprecated/gtkthemingengine.h [deleted file]
gtk/gtk.h
gtk/gtkcssarrayvalue.c
gtk/gtkcsscustomproperty.c
gtk/gtkcssenginevalue.c [deleted file]
gtk/gtkcssenginevalueprivate.h [deleted file]
gtk/gtkcssstylefuncs.c
gtk/gtkcssstylepropertyimpl.c
gtk/gtkcsstypesprivate.h
gtk/gtkstylecontext.h
testsuite/css/parser/deprecated.css
testsuite/css/parser/deprecated.errors
testsuite/css/parser/deprecated.ref.css
testsuite/css/parser/value-inherit.css
testsuite/css/parser/value-inherit.errors
testsuite/css/parser/value-initial.css
testsuite/css/parser/value-initial.errors
testsuite/css/parser/value-none.css
testsuite/css/parser/value-none.errors
testsuite/css/parser/value-none.ref.css

index 57fdbd6711a3d0ae763389f1f379f8a8d69db7cd..42caf16fdeb9e16c42e9ad1fa63e64c89ea7c562 100644 (file)
@@ -5919,47 +5919,6 @@ gtk_css_provider_error_quark
 gtk_css_section_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkthemingengine</FILE>
-<TITLE>GtkThemingEngine</TITLE>
-GtkThemingEngineClass
-GtkThemingEngine
-gtk_theming_engine_get
-gtk_theming_engine_get_direction
-gtk_theming_engine_get_junction_sides
-gtk_theming_engine_get_path
-gtk_theming_engine_get_property
-gtk_theming_engine_get_screen
-gtk_theming_engine_get_state
-gtk_theming_engine_get_style
-gtk_theming_engine_get_style_property
-gtk_theming_engine_get_style_valist
-gtk_theming_engine_get_valist
-gtk_theming_engine_get_color
-gtk_theming_engine_get_background_color
-gtk_theming_engine_get_border_color
-gtk_theming_engine_get_border
-gtk_theming_engine_get_padding
-gtk_theming_engine_get_margin
-gtk_theming_engine_get_font
-gtk_theming_engine_has_class
-gtk_theming_engine_has_region
-gtk_theming_engine_lookup_color
-gtk_theming_engine_state_is_running
-gtk_theming_engine_load
-gtk_theming_engine_register_property
-<SUBSECTION Standard>
-GTK_THEMING_ENGINE
-GTK_THEMING_ENGINE_CLASS
-GTK_THEMING_ENGINE_GET_CLASS
-GTK_IS_THEMING_ENGINE
-GTK_IS_THEMING_ENGINE_CLASS
-<SUBSECTION Private>
-GtkThemingEnginePrivate
-GTK_TYPE_THEMING_ENGINE
-gtk_theming_engine_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtksymboliccolor</FILE>
 <TITLE>GtkSymbolicColor</TITLE>
index c6cdc4c4c5e126d59a29942ff3a54b4942f0e20b..4ae9bac4e14d99a2db4753db4eade28107a3217c 100644 (file)
@@ -407,7 +407,6 @@ gtk_private_h_sources =             \
        gtkcsscustompropertyprivate.h   \
        gtkcssdimensionvalueprivate.h   \
        gtkcsseasevalueprivate.h        \
-       gtkcssenginevalueprivate.h      \
        gtkcssenumvalueprivate.h        \
        gtkcssgadgetprivate.h           \
        gtkcssiconthemevalueprivate.h   \
@@ -678,7 +677,6 @@ gtk_base_c_sources =                \
        gtkcssdimensionvalue.c  \
        gtkcsseasevalue.c       \
        gtkcssenumvalue.c       \
-       gtkcssenginevalue.c     \
        gtkcssgadget.c          \
        gtkcssiconthemevalue.c  \
        gtkcssimage.c           \
index beefc362eea6c083156e187755df9d9a9df207c6..75d7ac6f86ec5a554fe2997c4437c98c3ff18284 100644 (file)
@@ -10,7 +10,6 @@ deprecated_h_sources =                        \
        deprecated/gtkstyleproperties.h \
        deprecated/gtksymboliccolor.h   \
        deprecated/gtktable.h           \
-       deprecated/gtkthemingengine.h   \
        deprecated/gtktoggleaction.h    \
        deprecated/gtkuimanager.h
 
@@ -31,6 +30,5 @@ deprecated_c_sources =                        \
        deprecated/gtkstyleproperties.c \
        deprecated/gtksymboliccolor.c   \
        deprecated/gtktable.c           \
-       deprecated/gtkthemingengine.c   \
        deprecated/gtktoggleaction.c    \
        deprecated/gtkuimanager.c
index 30aac876a778e53f44587d2c55277889e1cca5df..36f49a80d120a8d1c473dc3088cf58fe176b6be7 100644 (file)
@@ -33,7 +33,6 @@
 #include "gtkstyleproviderprivate.h"
 #include "gtkintl.h"
 
-#include "deprecated/gtkthemingengine.h"
 #include "deprecated/gtkgradient.h"
 #include "deprecated/gtksymboliccolorprivate.h"
 
diff --git a/gtk/deprecated/gtkthemingengine.c b/gtk/deprecated/gtkthemingengine.c
deleted file mode 100644 (file)
index aa8e402..0000000
+++ /dev/null
@@ -1,1209 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <math.h>
-#include <gtk/gtk.h>
-
-#include <gtk/gtkstylecontext.h>
-#include <gtk/gtkintl.h>
-
-#include "gtkprivate.h"
-#include "gtkmodulesprivate.h"
-#include "gtkpango.h"
-#include "gtkrenderprivate.h"
-#include "gtkstylecontextprivate.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-/**
- * SECTION:gtkthemingengine
- * @Short_description: Theming renderers
- * @Title: GtkThemingEngine
- * @See_also: #GtkStyleContext
- *
- * #GtkThemingEngine was the object used for rendering themed content
- * in GTK+ widgets. It used to allow overriding GTK+'s default
- * implementation of rendering functions by allowing engines to be
- * loaded as modules.
- *
- * #GtkThemingEngine has been deprecated in GTK+ 3.14 and will be
- * ignored for rendering. The advancements in CSS theming are good
- * enough to allow themers to achieve their goals without the need
- * to modify source code.
- */
-
-enum {
-  PROP_0,
-  PROP_NAME
-};
-
-struct GtkThemingEnginePrivate
-{
-  GtkStyleContext *context;
-  gchar *name;
-};
-
-static void gtk_theming_engine_finalize          (GObject      *object);
-static void gtk_theming_engine_impl_set_property (GObject      *object,
-                                                  guint         prop_id,
-                                                  const GValue *value,
-                                                  GParamSpec   *pspec);
-static void gtk_theming_engine_impl_get_property (GObject      *object,
-                                                  guint         prop_id,
-                                                  GValue       *value,
-                                                  GParamSpec   *pspec);
-
-static void gtk_theming_engine_render_check (GtkThemingEngine *engine,
-                                             cairo_t          *cr,
-                                             gdouble           x,
-                                             gdouble           y,
-                                             gdouble           width,
-                                             gdouble           height);
-static void gtk_theming_engine_render_option (GtkThemingEngine *engine,
-                                              cairo_t          *cr,
-                                              gdouble           x,
-                                              gdouble           y,
-                                              gdouble           width,
-                                              gdouble           height);
-static void gtk_theming_engine_render_arrow  (GtkThemingEngine *engine,
-                                              cairo_t          *cr,
-                                              gdouble           angle,
-                                              gdouble           x,
-                                              gdouble           y,
-                                              gdouble           size);
-static void gtk_theming_engine_render_background (GtkThemingEngine *engine,
-                                                  cairo_t          *cr,
-                                                  gdouble           x,
-                                                  gdouble           y,
-                                                  gdouble           width,
-                                                  gdouble           height);
-static void gtk_theming_engine_render_frame  (GtkThemingEngine *engine,
-                                              cairo_t          *cr,
-                                              gdouble           x,
-                                              gdouble           y,
-                                              gdouble           width,
-                                              gdouble           height);
-static void gtk_theming_engine_render_expander (GtkThemingEngine *engine,
-                                                cairo_t          *cr,
-                                                gdouble           x,
-                                                gdouble           y,
-                                                gdouble           width,
-                                                gdouble           height);
-static void gtk_theming_engine_render_focus    (GtkThemingEngine *engine,
-                                                cairo_t          *cr,
-                                                gdouble           x,
-                                                gdouble           y,
-                                                gdouble           width,
-                                                gdouble           height);
-static void gtk_theming_engine_render_layout   (GtkThemingEngine *engine,
-                                                cairo_t          *cr,
-                                                gdouble           x,
-                                                gdouble           y,
-                                                PangoLayout      *layout);
-static void gtk_theming_engine_render_line     (GtkThemingEngine *engine,
-                                                cairo_t          *cr,
-                                                gdouble           x0,
-                                                gdouble           y0,
-                                                gdouble           x1,
-                                                gdouble           y1);
-static void gtk_theming_engine_render_slider   (GtkThemingEngine *engine,
-                                                cairo_t          *cr,
-                                                gdouble           x,
-                                                gdouble           y,
-                                                gdouble           width,
-                                                gdouble           height,
-                                                GtkOrientation    orientation);
-static void gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
-                                                 cairo_t          *cr,
-                                                 gdouble           x,
-                                                 gdouble           y,
-                                                 gdouble           width,
-                                                 gdouble           height,
-                                                 GtkPositionType   gap_side,
-                                                 gdouble           xy0_gap,
-                                                 gdouble           xy1_gap);
-static void gtk_theming_engine_render_extension (GtkThemingEngine *engine,
-                                                 cairo_t          *cr,
-                                                 gdouble           x,
-                                                 gdouble           y,
-                                                 gdouble           width,
-                                                 gdouble           height,
-                                                 GtkPositionType   gap_side);
-static void gtk_theming_engine_render_handle    (GtkThemingEngine *engine,
-                                                 cairo_t          *cr,
-                                                 gdouble           x,
-                                                 gdouble           y,
-                                                 gdouble           width,
-                                                 gdouble           height);
-static void gtk_theming_engine_render_activity  (GtkThemingEngine *engine,
-                                                 cairo_t          *cr,
-                                                 gdouble           x,
-                                                 gdouble           y,
-                                                 gdouble           width,
-                                                 gdouble           height);
-static GdkPixbuf * gtk_theming_engine_render_icon_pixbuf (GtkThemingEngine    *engine,
-                                                          const GtkIconSource *source,
-                                                          GtkIconSize          size);
-static void gtk_theming_engine_render_icon (GtkThemingEngine *engine,
-                                            cairo_t *cr,
-                                           GdkPixbuf *pixbuf,
-                                            gdouble x,
-                                            gdouble y);
-static void gtk_theming_engine_render_icon_surface (GtkThemingEngine *engine,
-                                                   cairo_t *cr,
-                                                   cairo_surface_t *surface,
-                                                   gdouble x,
-                                                   gdouble y);
-
-G_DEFINE_TYPE_WITH_PRIVATE (GtkThemingEngine, gtk_theming_engine, G_TYPE_OBJECT)
-
-typedef struct GtkThemingModule GtkThemingModule;
-typedef struct GtkThemingModuleClass GtkThemingModuleClass;
-
-struct GtkThemingModule
-{
-  GTypeModule parent_instance;
-  GModule *module;
-  gchar *name;
-
-  void (*init) (GTypeModule *module);
-  void (*exit) (void);
-  GtkThemingEngine * (*create_engine) (void);
-};
-
-struct GtkThemingModuleClass
-{
-  GTypeModuleClass parent_class;
-};
-
-#define GTK_TYPE_THEMING_MODULE  (gtk_theming_module_get_type ())
-#define GTK_THEMING_MODULE(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_THEMING_MODULE, GtkThemingModule))
-#define GTK_IS_THEMING_MODULE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_THEMING_MODULE))
-
-_GDK_EXTERN
-GType gtk_theming_module_get_type (void);
-
-G_DEFINE_TYPE (GtkThemingModule, gtk_theming_module, G_TYPE_TYPE_MODULE);
-
-static void
-gtk_theming_engine_class_init (GtkThemingEngineClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = gtk_theming_engine_finalize;
-  object_class->set_property = gtk_theming_engine_impl_set_property;
-  object_class->get_property = gtk_theming_engine_impl_get_property;
-
-  klass->render_icon = gtk_theming_engine_render_icon;
-  klass->render_check = gtk_theming_engine_render_check;
-  klass->render_option = gtk_theming_engine_render_option;
-  klass->render_arrow = gtk_theming_engine_render_arrow;
-  klass->render_background = gtk_theming_engine_render_background;
-  klass->render_frame = gtk_theming_engine_render_frame;
-  klass->render_expander = gtk_theming_engine_render_expander;
-  klass->render_focus = gtk_theming_engine_render_focus;
-  klass->render_layout = gtk_theming_engine_render_layout;
-  klass->render_line = gtk_theming_engine_render_line;
-  klass->render_slider = gtk_theming_engine_render_slider;
-  klass->render_frame_gap = gtk_theming_engine_render_frame_gap;
-  klass->render_extension = gtk_theming_engine_render_extension;
-  klass->render_handle = gtk_theming_engine_render_handle;
-  klass->render_activity = gtk_theming_engine_render_activity;
-  klass->render_icon_pixbuf = gtk_theming_engine_render_icon_pixbuf;
-  klass->render_icon_surface = gtk_theming_engine_render_icon_surface;
-
-  /**
-   * GtkThemingEngine:name:
-   *
-   * The theming engine name, this name will be used when registering
-   * custom properties, for a theming engine named "Clearlooks" registering
-   * a "glossy" custom property, it could be referenced in the CSS file as
-   *
-   * |[
-   * -Clearlooks-glossy: true;
-   * ]|
-   *
-   * Since: 3.0
-   */
-  g_object_class_install_property (object_class,
-                                  PROP_NAME,
-                                  g_param_spec_string ("name",
-                                                        P_("Name"),
-                                                        P_("Theming engine name"),
-                                                        NULL,
-                                                        G_PARAM_CONSTRUCT_ONLY | GTK_PARAM_READWRITE));
-}
-
-static void
-gtk_theming_engine_init (GtkThemingEngine *engine)
-{
-  engine->priv = gtk_theming_engine_get_instance_private (engine);
-}
-
-static void
-gtk_theming_engine_finalize (GObject *object)
-{
-  GtkThemingEnginePrivate *priv;
-
-  priv = GTK_THEMING_ENGINE (object)->priv;
-  g_free (priv->name);
-
-  G_OBJECT_CLASS (gtk_theming_engine_parent_class)->finalize (object);
-}
-
-static void
-gtk_theming_engine_impl_set_property (GObject      *object,
-                                      guint         prop_id,
-                                      const GValue *value,
-                                      GParamSpec   *pspec)
-{
-  GtkThemingEnginePrivate *priv;
-
-  priv = GTK_THEMING_ENGINE (object)->priv;
-
-  switch (prop_id)
-    {
-    case PROP_NAME:
-      g_free (priv->name);
-
-      priv->name = g_value_dup_string (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_theming_engine_impl_get_property (GObject    *object,
-                                      guint       prop_id,
-                                      GValue     *value,
-                                      GParamSpec *pspec)
-{
-  GtkThemingEnginePrivate *priv;
-
-  priv = GTK_THEMING_ENGINE (object)->priv;
-
-  switch (prop_id)
-    {
-    case PROP_NAME:
-      g_value_set_string (value, priv->name);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-/**
- * gtk_theming_engine_get_property:
- * @engine: a #GtkThemingEngine
- * @property: the property name
- * @state: state to retrieve the value for
- * @value: (out) (transfer full): return location for the property value,
- *         you must free this memory using g_value_unset() once you are
- *         done with it.
- *
- * Gets a property value as retrieved from the style settings that apply
- * to the currently rendered element.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_property (GtkThemingEngine *engine,
-                                 const gchar      *property,
-                                 GtkStateFlags     state,
-                                 GValue           *value)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-  g_return_if_fail (property != NULL);
-  g_return_if_fail (value != NULL);
-
-  priv = engine->priv;
-  gtk_style_context_get_property (priv->context, property, state, value);
-}
-
-/**
- * gtk_theming_engine_get_valist:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve values for
- * @args: va_list of property name/return location pairs, followed by %NULL
- *
- * Retrieves several style property values that apply to the currently
- * rendered element.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_valist (GtkThemingEngine *engine,
-                               GtkStateFlags     state,
-                               va_list           args)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_valist (priv->context, state, args);
-}
-
-/**
- * gtk_theming_engine_get:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve values for
- * @...: property name /return value pairs, followed by %NULL
- *
- * Retrieves several style property values that apply to the currently
- * rendered element.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get (GtkThemingEngine *engine,
-                        GtkStateFlags     state,
-                        ...)
-{
-  GtkThemingEnginePrivate *priv;
-  va_list args;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-
-  va_start (args, state);
-  gtk_style_context_get_valist (priv->context, state, args);
-  va_end (args);
-}
-
-/**
- * gtk_theming_engine_get_style_property:
- * @engine: a #GtkThemingEngine
- * @property_name: the name of the widget style property
- * @value: (out): Return location for the property value, free with
- *         g_value_unset() after use.
- *
- * Gets the value for a widget style property.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_style_property (GtkThemingEngine *engine,
-                                       const gchar      *property_name,
-                                       GValue           *value)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-  g_return_if_fail (property_name != NULL);
-
-  priv = engine->priv;
-  gtk_style_context_get_style_property (priv->context, property_name, value);
-}
-
-/**
- * gtk_theming_engine_get_style_valist:
- * @engine: a #GtkThemingEngine
- * @args: va_list of property name/return location pairs, followed by %NULL
- *
- * Retrieves several widget style properties from @engine according to the
- * currently rendered content’s style.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_style_valist (GtkThemingEngine *engine,
-                                     va_list           args)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_style_valist (priv->context, args);
-}
-
-/**
- * gtk_theming_engine_get_style:
- * @engine: a #GtkThemingEngine
- * @...: property name /return value pairs, followed by %NULL
- *
- * Retrieves several widget style properties from @engine according
- * to the currently rendered content’s style.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_style (GtkThemingEngine *engine,
-                              ...)
-{
-  GtkThemingEnginePrivate *priv;
-  va_list args;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-
-  va_start (args, engine);
-  gtk_style_context_get_style_valist (priv->context, args);
-  va_end (args);
-}
-
-/**
- * gtk_theming_engine_lookup_color:
- * @engine: a #GtkThemingEngine
- * @color_name: color name to lookup
- * @color: (out): Return location for the looked up color
- *
- * Looks up and resolves a color name in the current style’s color map.
- *
- * Returns: %TRUE if @color_name was found and resolved, %FALSE otherwise
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-gboolean
-gtk_theming_engine_lookup_color (GtkThemingEngine *engine,
-                                 const gchar      *color_name,
-                                 GdkRGBA          *color)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), FALSE);
-  g_return_val_if_fail (color_name != NULL, FALSE);
-
-  priv = engine->priv;
-  return gtk_style_context_lookup_color (priv->context, color_name, color);
-}
-
-/**
- * gtk_theming_engine_get_state:
- * @engine: a #GtkThemingEngine
- *
- * returns the state used when rendering.
- *
- * Returns: the state flags
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-GtkStateFlags
-gtk_theming_engine_get_state (GtkThemingEngine *engine)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), 0);
-
-  priv = engine->priv;
-  return gtk_style_context_get_state (priv->context);
-}
-
-/**
- * gtk_theming_engine_state_is_running:
- * @engine: a #GtkThemingEngine
- * @state: a widget state
- * @progress: (out): return location for the transition progress
- *
- * Returns %TRUE if there is a transition animation running for the
- * current region (see gtk_style_context_push_animatable_region()).
- *
- * If @progress is not %NULL, the animation progress will be returned
- * there, 0.0 means the state is closest to being %FALSE, while 1.0 means
- * it’s closest to being %TRUE. This means transition animations will
- * run from 0 to 1 when @state is being set to %TRUE and from 1 to 0 when
- * it’s being set to %FALSE.
- *
- * Returns: %TRUE if there is a running transition animation for @state.
- *
- * Since: 3.0
- *
- * Deprecated: 3.6: Always returns %FALSE
- **/
-gboolean
-gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
-                                     GtkStateType      state,
-                                     gdouble          *progress)
-{
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), FALSE);
-
-  return FALSE;
-}
-
-/**
- * gtk_theming_engine_get_path:
- * @engine: a #GtkThemingEngine
- *
- * Returns the widget path used for style matching.
- *
- * Returns: (transfer none): A #GtkWidgetPath
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-const GtkWidgetPath *
-gtk_theming_engine_get_path (GtkThemingEngine *engine)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), NULL);
-
-  priv = engine->priv;
-  return gtk_style_context_get_path (priv->context);
-}
-
-/**
- * gtk_theming_engine_has_class:
- * @engine: a #GtkThemingEngine
- * @style_class: class name to look up
- *
- * Returns %TRUE if the currently rendered contents have
- * defined the given class name.
- *
- * Returns: %TRUE if @engine has @class_name defined
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-gboolean
-gtk_theming_engine_has_class (GtkThemingEngine *engine,
-                              const gchar      *style_class)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), FALSE);
-
-  priv = engine->priv;
-  return gtk_style_context_has_class (priv->context, style_class);
-}
-
-/**
- * gtk_theming_engine_has_region:
- * @engine: a #GtkThemingEngine
- * @style_region: a region name
- * @flags: (out) (allow-none): return location for region flags
- *
- * Returns %TRUE if the currently rendered contents have the
- * region defined. If @flags_return is not %NULL, it is set
- * to the flags affecting the region.
- *
- * Returns: %TRUE if region is defined
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-gboolean
-gtk_theming_engine_has_region (GtkThemingEngine *engine,
-                               const gchar      *style_region,
-                               GtkRegionFlags   *flags)
-{
-  GtkThemingEnginePrivate *priv;
-
-  if (flags)
-    *flags = 0;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), FALSE);
-
-  priv = engine->priv;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  return gtk_style_context_has_region (priv->context, style_region, flags);
-G_GNUC_END_IGNORE_DEPRECATIONS
-}
-
-/**
- * gtk_theming_engine_get_direction:
- * @engine: a #GtkThemingEngine
- *
- * Returns the widget direction used for rendering.
- *
- * Returns: the widget direction
- *
- * Since: 3.0
- *
- * Deprecated: 3.8: Use gtk_theming_engine_get_state() and
- *   check for #GTK_STATE_FLAG_DIR_LTR and
- *   #GTK_STATE_FLAG_DIR_RTL instead.
- **/
-GtkTextDirection
-gtk_theming_engine_get_direction (GtkThemingEngine *engine)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), GTK_TEXT_DIR_LTR);
-
-  priv = engine->priv;
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  return gtk_style_context_get_direction (priv->context);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-}
-
-/**
- * gtk_theming_engine_get_junction_sides:
- * @engine: a #GtkThemingEngine
- *
- * Returns the widget direction used for rendering.
- *
- * Returns: the widget direction
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-GtkJunctionSides
-gtk_theming_engine_get_junction_sides (GtkThemingEngine *engine)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), 0);
-
-  priv = engine->priv;
-  return gtk_style_context_get_junction_sides (priv->context);
-}
-
-/**
- * gtk_theming_engine_get_color:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve the color for
- * @color: (out): return value for the foreground color
- *
- * Gets the foreground color for a given state.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_color (GtkThemingEngine *engine,
-                              GtkStateFlags     state,
-                              GdkRGBA          *color)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_color (priv->context, state, color);
-}
-
-/**
- * gtk_theming_engine_get_background_color:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve the color for
- * @color: (out): return value for the background color
- *
- * Gets the background color for a given state.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_background_color (GtkThemingEngine *engine,
-                                         GtkStateFlags     state,
-                                         GdkRGBA          *color)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_background_color (priv->context, state, color);
-}
-
-/**
- * gtk_theming_engine_get_border_color:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve the color for
- * @color: (out): return value for the border color
- *
- * Gets the border color for a given state.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_border_color (GtkThemingEngine *engine,
-                                     GtkStateFlags     state,
-                                     GdkRGBA          *color)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_border_color (priv->context, state, color);
-}
-
-/**
- * gtk_theming_engine_get_border:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve the border for
- * @border: (out): return value for the border settings
- *
- * Gets the border for a given state as a #GtkBorder.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_border (GtkThemingEngine *engine,
-                               GtkStateFlags     state,
-                               GtkBorder        *border)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_border (priv->context, state, border);
-}
-
-/**
- * gtk_theming_engine_get_padding:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve the padding for
- * @padding: (out): return value for the padding settings
- *
- * Gets the padding for a given state as a #GtkBorder.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_padding (GtkThemingEngine *engine,
-                                GtkStateFlags     state,
-                                GtkBorder        *padding)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_padding (priv->context, state, padding);
-}
-
-/**
- * gtk_theming_engine_get_margin:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve the border for
- * @margin: (out): return value for the margin settings
- *
- * Gets the margin for a given state as a #GtkBorder.
- *
- * Since: 3.0
- *
- * Deprecated: 3.14
- **/
-void
-gtk_theming_engine_get_margin (GtkThemingEngine *engine,
-                               GtkStateFlags     state,
-                               GtkBorder        *margin)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_if_fail (GTK_IS_THEMING_ENGINE (engine));
-
-  priv = engine->priv;
-  gtk_style_context_get_margin (priv->context, state, margin);
-}
-
-/**
- * gtk_theming_engine_get_font:
- * @engine: a #GtkThemingEngine
- * @state: state to retrieve the font for
- *
- * Returns the font description for a given state.
- *
- * Returns: (transfer none): the #PangoFontDescription for the given
- *          state. This object is owned by GTK+ and should not be
- *          freed.
- *
- * Since: 3.0
- *
- * Deprecated: 3.8: Use gtk_theming_engine_get()
- **/
-const PangoFontDescription *
-gtk_theming_engine_get_font (GtkThemingEngine *engine,
-                             GtkStateFlags     state)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), NULL);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  priv = engine->priv;
-  return gtk_style_context_get_font (priv->context, state);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-}
-
-/* GtkThemingModule */
-
-static gboolean
-gtk_theming_module_load (GTypeModule *type_module)
-{
-  GtkThemingModule *theming_module;
-  GModule *module;
-  gchar *name, *module_path;
-
-  theming_module = GTK_THEMING_MODULE (type_module);
-  name = theming_module->name;
-  module_path = _gtk_find_module (name, "theming-engines");
-
-  if (!module_path)
-    return FALSE;
-
-  module = g_module_open (module_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-  g_free (module_path);
-
-  if (!module)
-    return FALSE;
-
-  if (!g_module_symbol (module, "theme_init",
-                        (gpointer *) &theming_module->init) ||
-      !g_module_symbol (module, "theme_exit",
-                        (gpointer *) &theming_module->exit) ||
-      !g_module_symbol (module, "create_engine",
-                        (gpointer *) &theming_module->create_engine))
-    {
-      g_module_close (module);
-
-      return FALSE;
-    }
-
-  theming_module->module = module;
-
-  theming_module->init (G_TYPE_MODULE (theming_module));
-
-  return TRUE;
-}
-
-static void
-gtk_theming_module_unload (GTypeModule *type_module)
-{
-  GtkThemingModule *theming_module;
-
-  theming_module = GTK_THEMING_MODULE (type_module);
-
-  theming_module->exit ();
-
-  g_module_close (theming_module->module);
-
-  theming_module->module = NULL;
-  theming_module->init = NULL;
-  theming_module->exit = NULL;
-  theming_module->create_engine = NULL;
-}
-
-static void
-gtk_theming_module_class_init (GtkThemingModuleClass *klass)
-{
-  GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (klass);
-
-  module_class->load = gtk_theming_module_load;
-  module_class->unload = gtk_theming_module_unload;
-}
-
-static void
-gtk_theming_module_init (GtkThemingModule *module)
-{
-}
-
-/**
- * gtk_theming_engine_load:
- * @name: Theme engine name to load
- *
- * Loads and initializes a theming engine module from the
- * standard directories.
- *
- * Returns: (nullable) (transfer none): A theming engine, or %NULL if
- * the engine @name doesn’t exist.
- *
- * Deprecated: 3.14
- **/
-GtkThemingEngine *
-gtk_theming_engine_load (const gchar *name)
-{
-  static GHashTable *engines = NULL;
-  static GtkThemingEngine *default_engine;
-  GtkThemingEngine *engine = NULL;
-
-  if (name)
-    {
-      if (!engines)
-        engines = g_hash_table_new (g_str_hash, g_str_equal);
-
-      engine = g_hash_table_lookup (engines, name);
-
-      if (!engine)
-        {
-          GtkThemingModule *module;
-
-          module = g_object_new (GTK_TYPE_THEMING_MODULE, NULL);
-          g_type_module_set_name (G_TYPE_MODULE (module), name);
-          module->name = g_strdup (name);
-
-          if (module && g_type_module_use (G_TYPE_MODULE (module)))
-            {
-              engine = (module->create_engine) ();
-
-              if (engine)
-                g_hash_table_insert (engines, module->name, engine);
-            }
-        }
-    }
-  else
-    {
-      if (G_UNLIKELY (!default_engine))
-        default_engine = g_object_new (GTK_TYPE_THEMING_ENGINE, NULL);
-
-      engine = default_engine;
-    }
-
-  return engine;
-}
-
-/**
- * gtk_theming_engine_get_screen:
- * @engine: a #GtkThemingEngine
- *
- * Returns the #GdkScreen to which @engine currently rendering to.
- *
- * Returns: (nullable) (transfer none): a #GdkScreen, or %NULL.
- *
- * Deprecated: 3.14
- **/
-GdkScreen *
-gtk_theming_engine_get_screen (GtkThemingEngine *engine)
-{
-  GtkThemingEnginePrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), NULL);
-
-  priv = engine->priv;
-  return gtk_style_context_get_screen (priv->context);
-}
-
-/* Paint method implementations */
-static void
-gtk_theming_engine_render_check (GtkThemingEngine *engine,
-                                 cairo_t          *cr,
-                                 gdouble           x,
-                                 gdouble           y,
-                                 gdouble           width,
-                                 gdouble           height)
-{
-  gtk_render_check (engine->priv->context, cr, x, y, width, height);
-}
-
-static void
-gtk_theming_engine_render_option (GtkThemingEngine *engine,
-                                  cairo_t          *cr,
-                                  gdouble           x,
-                                  gdouble           y,
-                                  gdouble           width,
-                                  gdouble           height)
-{
-  gtk_render_option (engine->priv->context, cr, x, y, width, height);
-}
-
-static void
-gtk_theming_engine_render_arrow (GtkThemingEngine *engine,
-                                 cairo_t          *cr,
-                                 gdouble           angle,
-                                 gdouble           x,
-                                 gdouble           y,
-                                 gdouble           size)
-{
-  gtk_render_arrow (engine->priv->context, cr, angle, x, y, size);
-}
-
-static void
-gtk_theming_engine_render_background (GtkThemingEngine *engine,
-                                      cairo_t          *cr,
-                                      gdouble           x,
-                                      gdouble           y,
-                                      gdouble           width,
-                                      gdouble           height)
-{
-  gtk_render_background (engine->priv->context, cr, x, y, width, height);
-}
-
-static void
-gtk_theming_engine_render_frame (GtkThemingEngine *engine,
-                                 cairo_t          *cr,
-                                 gdouble           x,
-                                 gdouble           y,
-                                 gdouble           width,
-                                 gdouble           height)
-{
-  gtk_render_frame (engine->priv->context, cr, x, y, width, height);
-}
-
-static void
-gtk_theming_engine_render_expander (GtkThemingEngine *engine,
-                                    cairo_t          *cr,
-                                    gdouble           x,
-                                    gdouble           y,
-                                    gdouble           width,
-                                    gdouble           height)
-{
-  gtk_render_expander (engine->priv->context, cr, x, y, width, height);
-}
-
-static void
-gtk_theming_engine_render_focus (GtkThemingEngine *engine,
-                                 cairo_t          *cr,
-                                 gdouble           x,
-                                 gdouble           y,
-                                 gdouble           width,
-                                 gdouble           height)
-{
-  gtk_render_focus (engine->priv->context, cr, x, y, width, height);
-}
-
-static void
-gtk_theming_engine_render_line (GtkThemingEngine *engine,
-                                cairo_t          *cr,
-                                gdouble           x0,
-                                gdouble           y0,
-                                gdouble           x1,
-                                gdouble           y1)
-{
-  gtk_render_line (engine->priv->context, cr, x0, y0, x1, y1);
-}
-
-static void
-gtk_theming_engine_render_layout (GtkThemingEngine *engine,
-                                  cairo_t          *cr,
-                                  gdouble           x,
-                                  gdouble           y,
-                                  PangoLayout      *layout)
-{
-  gtk_render_layout (engine->priv->context, cr, x, y, layout);
-}
-
-static void
-gtk_theming_engine_render_slider (GtkThemingEngine *engine,
-                                  cairo_t          *cr,
-                                  gdouble           x,
-                                  gdouble           y,
-                                  gdouble           width,
-                                  gdouble           height,
-                                  GtkOrientation    orientation)
-{
-  gtk_render_slider (engine->priv->context, cr, x, y, width, height, orientation);
-}
-
-static void
-gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
-                                     cairo_t          *cr,
-                                     gdouble           x,
-                                     gdouble           y,
-                                     gdouble           width,
-                                     gdouble           height,
-                                     GtkPositionType   gap_side,
-                                     gdouble           xy0_gap,
-                                     gdouble           xy1_gap)
-{
-  gtk_render_frame_gap (engine->priv->context, cr, x, y, width, height, gap_side, xy0_gap, xy1_gap);
-}
-
-static void
-gtk_theming_engine_render_extension (GtkThemingEngine *engine,
-                                     cairo_t          *cr,
-                                     gdouble           x,
-                                     gdouble           y,
-                                     gdouble           width,
-                                     gdouble           height,
-                                     GtkPositionType   gap_side)
-{
-  gtk_render_extension (engine->priv->context, cr, x, y, width, height, gap_side);
-}
-
-static void
-gtk_theming_engine_render_handle (GtkThemingEngine *engine,
-                                  cairo_t          *cr,
-                                  gdouble           x,
-                                  gdouble           y,
-                                  gdouble           width,
-                                  gdouble           height)
-{
-  gtk_render_handle (engine->priv->context, cr, x, y, width, height);
-}
-
-static void
-gtk_theming_engine_render_activity (GtkThemingEngine *engine,
-                                    cairo_t          *cr,
-                                    gdouble           x,
-                                    gdouble           y,
-                                    gdouble           width,
-                                    gdouble           height)
-{
-  gtk_render_activity (engine->priv->context, cr, x, y, width, height);
-}
-
-static GdkPixbuf *
-gtk_theming_engine_render_icon_pixbuf (GtkThemingEngine    *engine,
-                                       const GtkIconSource *source,
-                                       GtkIconSize          size)
-{
-  return NULL;
-}
-
-static void
-gtk_theming_engine_render_icon (GtkThemingEngine *engine,
-                                cairo_t *cr,
-                               GdkPixbuf *pixbuf,
-                                gdouble x,
-                                gdouble y)
-{
-  gtk_render_icon (engine->priv->context, cr, pixbuf, x, y);
-}
-
-static void
-gtk_theming_engine_render_icon_surface (GtkThemingEngine *engine,
-                                       cairo_t *cr,
-                                       cairo_surface_t *surface,
-                                       gdouble x,
-                                       gdouble y)
-{
-  gtk_render_icon_surface (engine->priv->context, cr, surface, x, y);
-}
-
-G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/gtk/deprecated/gtkthemingengine.h b/gtk/deprecated/gtkthemingengine.h
deleted file mode 100644 (file)
index e04fc1c..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_THEMING_ENGINE_H__
-#define __GTK_THEMING_ENGINE_H__
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#include <glib-object.h>
-#include <cairo.h>
-
-#include <gtk/gtkborder.h>
-#include <gtk/gtkenums.h>
-#include <gtk/deprecated/gtkstyleproperties.h>
-#include <gtk/gtktypes.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_THEMING_ENGINE         (gtk_theming_engine_get_type ())
-#define GTK_THEMING_ENGINE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_THEMING_ENGINE, GtkThemingEngine))
-#define GTK_THEMING_ENGINE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_THEMING_ENGINE, GtkThemingEngineClass))
-#define GTK_IS_THEMING_ENGINE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_THEMING_ENGINE))
-#define GTK_IS_THEMING_ENGINE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_THEMING_ENGINE))
-#define GTK_THEMING_ENGINE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_THEMING_ENGINE, GtkThemingEngineClass))
-
-typedef struct _GtkThemingEngine GtkThemingEngine;
-typedef struct GtkThemingEnginePrivate GtkThemingEnginePrivate;
-typedef struct _GtkThemingEngineClass GtkThemingEngineClass;
-
-struct _GtkThemingEngine
-{
-  GObject parent_object;
-  GtkThemingEnginePrivate *priv;
-};
-
-/**
- * GtkThemingEngineClass:
- * @parent_class: The parent class.
- * @render_line: Renders a line between two points.
- * @render_background: Renders the background area of a widget region.
- * @render_frame: Renders the frame around a widget area.
- * @render_frame_gap: Renders the frame around a widget area with a gap in it.
- * @render_extension: Renders a extension to a box, usually a notebook tab.
- * @render_check: Renders a checkmark, as in #GtkCheckButton.
- * @render_option: Renders an option, as in #GtkRadioButton.
- * @render_arrow: Renders an arrow pointing to a certain direction.
- * @render_expander: Renders an element what will expose/expand part of
- *                   the UI, as in #GtkExpander.
- * @render_focus: Renders the focus indicator.
- * @render_layout: Renders a #PangoLayout
- * @render_slider: Renders a slider control, as in #GtkScale.
- * @render_handle: Renders a handle to drag UI elements, as in #GtkPaned.
- * @render_activity: Renders an area displaying activity, such as in #GtkSpinner,
- *                   or #GtkProgressBar.
- * @render_icon_pixbuf: Renders an icon as a #GdkPixbuf.
- * @render_icon: Renders an icon given as a #GdkPixbuf.
- * @render_icon_surface: Renders an icon given as a #cairo_surface_t.
- *
- * Base class for theming engines.
- */
-struct _GtkThemingEngineClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  void (* render_line) (GtkThemingEngine *engine,
-                        cairo_t          *cr,
-                        gdouble           x0,
-                        gdouble           y0,
-                        gdouble           x1,
-                        gdouble           y1);
-  void (* render_background) (GtkThemingEngine *engine,
-                              cairo_t          *cr,
-                              gdouble           x,
-                              gdouble           y,
-                              gdouble           width,
-                              gdouble           height);
-  void (* render_frame) (GtkThemingEngine *engine,
-                         cairo_t          *cr,
-                         gdouble           x,
-                         gdouble           y,
-                         gdouble           width,
-                         gdouble           height);
-  void (* render_frame_gap) (GtkThemingEngine *engine,
-                             cairo_t          *cr,
-                             gdouble           x,
-                             gdouble           y,
-                             gdouble           width,
-                             gdouble           height,
-                             GtkPositionType   gap_side,
-                             gdouble           xy0_gap,
-                             gdouble           xy1_gap);
-  void (* render_extension) (GtkThemingEngine *engine,
-                             cairo_t          *cr,
-                             gdouble           x,
-                             gdouble           y,
-                             gdouble           width,
-                             gdouble           height,
-                             GtkPositionType   gap_side);
-  void (* render_check) (GtkThemingEngine *engine,
-                         cairo_t          *cr,
-                         gdouble           x,
-                         gdouble           y,
-                         gdouble           width,
-                         gdouble           height);
-  void (* render_option) (GtkThemingEngine *engine,
-                          cairo_t          *cr,
-                          gdouble           x,
-                          gdouble           y,
-                          gdouble           width,
-                          gdouble           height);
-  void (* render_arrow) (GtkThemingEngine *engine,
-                         cairo_t          *cr,
-                         gdouble           angle,
-                         gdouble           x,
-                         gdouble           y,
-                         gdouble           size);
-  void (* render_expander) (GtkThemingEngine *engine,
-                            cairo_t          *cr,
-                            gdouble           x,
-                            gdouble           y,
-                            gdouble           width,
-                            gdouble           height);
-  void (* render_focus) (GtkThemingEngine *engine,
-                         cairo_t          *cr,
-                         gdouble           x,
-                         gdouble           y,
-                         gdouble           width,
-                         gdouble           height);
-  void (* render_layout) (GtkThemingEngine *engine,
-                          cairo_t          *cr,
-                          gdouble           x,
-                          gdouble           y,
-                          PangoLayout      *layout);
-  void (* render_slider) (GtkThemingEngine *engine,
-                          cairo_t          *cr,
-                          gdouble           x,
-                          gdouble           y,
-                          gdouble           width,
-                          gdouble           height,
-                          GtkOrientation    orientation);
-  void (* render_handle)    (GtkThemingEngine *engine,
-                             cairo_t          *cr,
-                             gdouble           x,
-                             gdouble           y,
-                             gdouble           width,
-                             gdouble           height);
-  void (* render_activity) (GtkThemingEngine *engine,
-                            cairo_t          *cr,
-                            gdouble           x,
-                            gdouble           y,
-                            gdouble           width,
-                            gdouble           height);
-
-  GdkPixbuf * (* render_icon_pixbuf) (GtkThemingEngine    *engine,
-                                      const GtkIconSource *source,
-                                      GtkIconSize          size);
-  void (* render_icon) (GtkThemingEngine *engine,
-                        cairo_t          *cr,
-                       GdkPixbuf        *pixbuf,
-                        gdouble           x,
-                        gdouble           y);
-  void (* render_icon_surface) (GtkThemingEngine *engine,
-                               cairo_t          *cr,
-                               cairo_surface_t  *surface,
-                               gdouble           x,
-                               gdouble           y);
-
-  /*< private >*/
-  gpointer padding[14];
-};
-
-GDK_DEPRECATED_IN_3_14
-GType gtk_theming_engine_get_type (void) G_GNUC_CONST;
-
-/* function implemented in gtkcsscustomproperty.c */
-GDK_DEPRECATED_IN_3_8
-void gtk_theming_engine_register_property (const gchar            *name_space,
-                                           GtkStylePropertyParser  parse_func,
-                                           GParamSpec             *pspec);
-
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_property (GtkThemingEngine *engine,
-                                      const gchar      *property,
-                                      GtkStateFlags     state,
-                                      GValue           *value);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_valist   (GtkThemingEngine *engine,
-                                      GtkStateFlags     state,
-                                      va_list           args);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get          (GtkThemingEngine *engine,
-                                      GtkStateFlags     state,
-                                      ...) G_GNUC_NULL_TERMINATED;
-
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_style_property (GtkThemingEngine *engine,
-                                            const gchar      *property_name,
-                                            GValue           *value);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_style_valist   (GtkThemingEngine *engine,
-                                            va_list           args);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_style          (GtkThemingEngine *engine,
-                                            ...);
-
-GDK_DEPRECATED_IN_3_14
-gboolean gtk_theming_engine_lookup_color (GtkThemingEngine *engine,
-                                          const gchar      *color_name,
-                                          GdkRGBA          *color);
-
-GDK_DEPRECATED_IN_3_14
-const GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
-
-GDK_DEPRECATED_IN_3_14
-gboolean gtk_theming_engine_has_class  (GtkThemingEngine *engine,
-                                        const gchar      *style_class);
-GDK_DEPRECATED_IN_3_14
-gboolean gtk_theming_engine_has_region (GtkThemingEngine *engine,
-                                        const gchar      *style_region,
-                                        GtkRegionFlags   *flags);
-
-GDK_DEPRECATED_IN_3_14
-GtkStateFlags gtk_theming_engine_get_state        (GtkThemingEngine *engine);
-GDK_DEPRECATED_IN_3_6
-gboolean      gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
-                                                   GtkStateType      state,
-                                                   gdouble          *progress);
-
-GDK_DEPRECATED_IN_3_8_FOR(gtk_theming_engine_get_state)
-GtkTextDirection gtk_theming_engine_get_direction (GtkThemingEngine *engine);
-
-GDK_DEPRECATED_IN_3_14
-GtkJunctionSides gtk_theming_engine_get_junction_sides (GtkThemingEngine *engine);
-
-/* Helper functions */
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_color            (GtkThemingEngine *engine,
-                                              GtkStateFlags     state,
-                                              GdkRGBA          *color);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_background_color (GtkThemingEngine *engine,
-                                              GtkStateFlags     state,
-                                              GdkRGBA          *color);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_border_color     (GtkThemingEngine *engine,
-                                              GtkStateFlags     state,
-                                              GdkRGBA          *color);
-
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_border  (GtkThemingEngine *engine,
-                                     GtkStateFlags     state,
-                                     GtkBorder        *border);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_padding (GtkThemingEngine *engine,
-                                     GtkStateFlags     state,
-                                     GtkBorder        *padding);
-GDK_DEPRECATED_IN_3_14
-void gtk_theming_engine_get_margin  (GtkThemingEngine *engine,
-                                     GtkStateFlags     state,
-                                     GtkBorder        *margin);
-
-GDK_DEPRECATED_IN_3_8_FOR(gtk_theming_engine_get)
-const PangoFontDescription * gtk_theming_engine_get_font (GtkThemingEngine *engine,
-                                                          GtkStateFlags     state);
-
-GDK_DEPRECATED_IN_3_14
-GtkThemingEngine * gtk_theming_engine_load (const gchar *name);
-
-GDK_DEPRECATED_IN_3_14
-GdkScreen * gtk_theming_engine_get_screen (GtkThemingEngine *engine);
-
-G_END_DECLS
-
-#endif /* __GTK_THEMING_ENGINE_H__ */
index d20ea12d7cbb55c207b629a6e82d005f41b5568b..9eef2116d0b8b037c253b8192d59b04458a31205 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
 #include <gtk/deprecated/gtkstyleproperties.h>
 #include <gtk/deprecated/gtksymboliccolor.h>
 #include <gtk/deprecated/gtktable.h>
-#include <gtk/deprecated/gtkthemingengine.h>
 #include <gtk/deprecated/gtktoggleaction.h>
 #include <gtk/deprecated/gtkuimanager.h>
 #endif /* GTK_DISABLE_DEPRECATED */
index d5646373feb0b9695b397ac1214023451e59a2a5..edda8866031bc36307995adda682e188bdc794ff 100644 (file)
@@ -285,7 +285,6 @@ gtk_css_value_array_transition (GtkCssValue *start,
     case GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT:
     case GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE:
     case GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH:
-    case GTK_CSS_PROPERTY_ENGINE:
     default:
       /* keep all values that are not arrays here, so we get a warning if we ever turn them
        * into arrays and start animating them. */
index 4a73c17b260e6423b1618b3ef1b9f45e3dc0da0b..3d5c74db152fc3832a8b1af50bc66ed2938ee9a4 100644 (file)
@@ -27,8 +27,6 @@
 #include "gtkcsstypedvalueprivate.h"
 #include "deprecated/gtkstylepropertiesprivate.h"
 
-#include "deprecated/gtkthemingengine.h"
-
 #include "deprecated/gtksymboliccolor.h"
 
 G_DEFINE_TYPE (GtkCssCustomProperty, _gtk_css_custom_property, GTK_TYPE_CSS_STYLE_PROPERTY)
@@ -100,9 +98,7 @@ gtk_css_custom_property_create_initial_value (GParamSpec *pspec)
 
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  if (pspec->value_type == GTK_TYPE_THEMING_ENGINE)
-    g_value_set_object (&value, gtk_theming_engine_load (NULL));
-  else if (pspec->value_type == PANGO_TYPE_FONT_DESCRIPTION)
+  if (pspec->value_type == PANGO_TYPE_FONT_DESCRIPTION)
     g_value_take_boxed (&value, pango_font_description_from_string ("Sans 10"));
   else if (pspec->value_type == GDK_TYPE_RGBA)
     {
diff --git a/gtk/gtkcssenginevalue.c b/gtk/gtkcssenginevalue.c
deleted file mode 100644 (file)
index 2d9a4da..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#define GDK_DISABLE_DEPRECATION_WARNINGS
-#include "gtkcssenginevalueprivate.h"
-
-#include "gtkstylepropertyprivate.h"
-
-struct _GtkCssValue {
-  GTK_CSS_VALUE_BASE
-  GtkThemingEngine *engine;
-};
-
-static void
-gtk_css_value_engine_free (GtkCssValue *value)
-{
-  g_object_unref (value->engine);
-
-  g_slice_free (GtkCssValue, value);
-}
-
-static GtkCssValue *
-gtk_css_value_engine_compute (GtkCssValue             *value,
-                              guint                    property_id,
-                              GtkStyleProviderPrivate *provider,
-                              GtkCssStyle             *style,
-                              GtkCssStyle             *parent_style)
-{
-  return _gtk_css_value_ref (value);
-}
-
-static gboolean
-gtk_css_value_engine_equal (const GtkCssValue *value1,
-                            const GtkCssValue *value2)
-{
-  return value1->engine == value2->engine;
-}
-
-static GtkCssValue *
-gtk_css_value_engine_transition (GtkCssValue *start,
-                                 GtkCssValue *end,
-                                 guint        property_id,
-                                 double       progress)
-{
-  return NULL;
-}
-
-static void
-gtk_css_value_engine_print (const GtkCssValue *value,
-                            GString           *string)
-{
-  char *name;
-
-  g_object_get (value->engine, "name", &name, NULL);
-
-  if (name)
-    g_string_append (string, name);
-  else
-    g_string_append (string, "none");
-
-  g_free (name);
-}
-
-static const GtkCssValueClass GTK_CSS_VALUE_ENGINE = {
-  gtk_css_value_engine_free,
-  gtk_css_value_engine_compute,
-  gtk_css_value_engine_equal,
-  gtk_css_value_engine_transition,
-  gtk_css_value_engine_print
-};
-
-GtkCssValue *
-_gtk_css_engine_value_new (GtkThemingEngine *engine)
-{
-  GtkCssValue *result;
-
-  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), NULL);
-
-  result = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_ENGINE);
-  result->engine = g_object_ref (engine);
-
-  return result;
-}
-
-GtkCssValue *
-_gtk_css_engine_value_parse (GtkCssParser *parser)
-{
-  GtkThemingEngine *engine;
-  char *str;
-
-  g_return_val_if_fail (parser != NULL, NULL);
-
-  if (_gtk_css_parser_try (parser, "none", TRUE))
-    return _gtk_css_engine_value_new (gtk_theming_engine_load (NULL));
-
-  str = _gtk_css_parser_try_ident (parser, TRUE);
-  if (str == NULL)
-    {
-      _gtk_css_parser_error (parser, "Expected a valid theme name");
-      return NULL;
-    }
-
-  engine = gtk_theming_engine_load (str);
-
-  if (engine == NULL)
-    {
-      _gtk_css_parser_error (parser, "Theming engine '%s' not found", str);
-      g_free (str);
-      return NULL;
-    }
-
-  g_free (str);
-
-  return _gtk_css_engine_value_new (engine);
-}
-
-GtkThemingEngine *
-_gtk_css_engine_value_get_engine (const GtkCssValue *value)
-{
-  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_ENGINE, NULL);
-
-  return value->engine;
-}
-
diff --git a/gtk/gtkcssenginevalueprivate.h b/gtk/gtkcssenginevalueprivate.h
deleted file mode 100644 (file)
index 36f1101..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright © 2012 Red Hat Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Alexander Larsson <alexl@gnome.org>
- */
-
-#ifndef __GTK_CSS_ENGINE_VALUE_PRIVATE_H__
-#define __GTK_CSS_ENGINE_VALUE_PRIVATE_H__
-
-#include "gtkcssparserprivate.h"
-#include "gtkcssvalueprivate.h"
-#include "deprecated/gtkthemingengine.h"
-
-G_BEGIN_DECLS
-
-GtkCssValue *       _gtk_css_engine_value_new           (GtkThemingEngine       *engine);
-GtkCssValue *       _gtk_css_engine_value_parse         (GtkCssParser           *parser);
-
-GtkThemingEngine *  _gtk_css_engine_value_get_engine    (const GtkCssValue      *engine);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CSS_ENGINE_VALUE_PRIVATE_H__ */
index 466863114ae7b1573563adab68dca30692824f0c..0a379eabebcadadc974f01d97eb9fea02319e1e1 100644 (file)
@@ -38,7 +38,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkcsswin32sizevalueprivate.h"
 
-#include "deprecated/gtkthemingengine.h"
 #include "deprecated/gtkgradientprivate.h"
 #include "deprecated/gtksymboliccolorprivate.h"
 
@@ -551,63 +550,6 @@ string_value_print (const GValue *value,
   string_append_string (str, g_value_get_string (value));
 }
 
-static gboolean 
-theming_engine_value_parse (GtkCssParser *parser,
-                            GValue       *value)
-{
-  GtkThemingEngine *engine;
-  char *str;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-  if (_gtk_css_parser_try (parser, "none", TRUE))
-    {
-      g_value_set_object (value, gtk_theming_engine_load (NULL));
-      return TRUE;
-    }
-
-  str = _gtk_css_parser_try_ident (parser, TRUE);
-  if (str == NULL)
-    {
-      _gtk_css_parser_error (parser, "Expected a valid theme name");
-      return FALSE;
-    }
-
-  engine = gtk_theming_engine_load (str);
-
-  if (engine == NULL)
-    {
-      _gtk_css_parser_error (parser, "Theming engine '%s' not found", str);
-      g_free (str);
-      return FALSE;
-    }
-
-  g_value_set_object (value, engine);
-  g_free (str);
-  return TRUE;
-
-G_GNUC_END_IGNORE_DEPRECATIONS
-}
-
-static void
-theming_engine_value_print (const GValue *value,
-                            GString      *string)
-{
-  GtkThemingEngine *engine;
-  char *name;
-
-  engine = g_value_get_object (value);
-  if (engine == NULL)
-    g_string_append (string, "none");
-  else
-    {
-      /* XXX: gtk_theming_engine_get_name()? */
-      g_object_get (engine, "name", &name, NULL);
-      g_string_append (string, name ? name : "none");
-      g_free (name);
-    }
-}
-
 static gboolean 
 border_value_parse (GtkCssParser *parser,
                     GValue       *value)
@@ -1021,16 +963,6 @@ gtk_css_style_funcs_init (void)
                                 string_value_parse,
                                 string_value_print,
                                 NULL);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-  register_conversion_function (GTK_TYPE_THEMING_ENGINE,
-                                theming_engine_value_parse,
-                                theming_engine_value_print,
-                                NULL);
-
-  G_GNUC_END_IGNORE_DEPRECATIONS
-
   register_conversion_function (GTK_TYPE_BORDER,
                                 border_value_parse,
                                 border_value_print,
index 9fd506a0ca1cc2ff5fb1d9a15649202f1065a0a7..319092383aaad958735d7455e54dd28e7cab9fea 100644 (file)
@@ -44,7 +44,6 @@
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcsseasevalueprivate.h"
-#include "gtkcssenginevalueprivate.h"
 #include "gtkcssiconthemevalueprivate.h"
 #include "gtkcssimageprivate.h"
 #include "gtkcssimagebuiltinprivate.h"
@@ -62,8 +61,6 @@
 #include "gtkcsstransformvalueprivate.h"
 #include "gtktypebuiltins.h"
 
-#include "deprecated/gtkthemingengine.h"
-
 /*** REGISTRATION ***/
 
 typedef enum {
@@ -931,31 +928,6 @@ iteration_count_parse (GtkCssStyleProperty *property,
   return _gtk_css_array_value_parse (parser, iteration_count_parse_one);
 }
 
-static GtkCssValue *
-engine_parse (GtkCssStyleProperty *property,
-              GtkCssParser        *parser)
-{
-  return _gtk_css_engine_value_parse (parser);
-}
-
-static void
-engine_query (GtkCssStyleProperty *property,
-              const GtkCssValue   *css_value,
-              GValue              *value)
-{
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  g_value_init (value, GTK_TYPE_THEMING_ENGINE);
-  g_value_set_object (value, _gtk_css_engine_value_get_engine (css_value));
-G_GNUC_END_IGNORE_DEPRECATIONS
-}
-
-static GtkCssValue *
-engine_assign (GtkCssStyleProperty *property,
-               const GValue        *value)
-{
-  return _gtk_css_engine_value_new (g_value_get_object (value));
-}
-
 static GtkCssValue *
 parse_margin (GtkCssStyleProperty *property,
               GtkCssParser        *parser)
@@ -1827,18 +1799,6 @@ _gtk_css_style_property_init_properties (void)
                                          _gtk_css_icon_effect_value_new (GTK_CSS_ICON_EFFECT_NONE));
   _gtk_style_property_add_alias ("-gtk-icon-effect", "-gtk-image-effect");
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_css_style_property_register        ("engine",
-                                          GTK_CSS_PROPERTY_ENGINE,
-                                          GTK_TYPE_THEMING_ENGINE,
-                                          0,
-                                          0,
-                                          engine_parse,
-                                          engine_query,
-                                          engine_assign,
-                                          _gtk_css_engine_value_new (gtk_theming_engine_load (NULL)));
-G_GNUC_END_IGNORE_DEPRECATIONS
-
   /* Private property holding the binding sets */
   gtk_css_style_property_register        ("-gtk-key-bindings",
                                           GTK_CSS_PROPERTY_GTK_KEY_BINDINGS,
index 59f392a032aefaacdb3fe64454d762ad2306f037..dfc1f5e4eec76b31fbdaaae109b06c5268b8ba34 100644 (file)
@@ -223,7 +223,6 @@ enum { /*< skip >*/
   GTK_CSS_PROPERTY_ANIMATION_FILL_MODE,
   GTK_CSS_PROPERTY_OPACITY,
   GTK_CSS_PROPERTY_ICON_EFFECT,
-  GTK_CSS_PROPERTY_ENGINE,
   GTK_CSS_PROPERTY_GTK_KEY_BINDINGS,
   GTK_CSS_PROPERTY_CARET_COLOR,
   GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR,
index 0ca572c44a5de8895d217d2245c6f0838011f9f6..27519b66438a724e1dbfdb5747d570d4fb99155c 100644 (file)
@@ -1091,18 +1091,6 @@ GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_style          (GtkStyleContext *context,
                                            ...);
 
-GDK_DEPRECATED_IN_3_10
-GdkPixbuf  * gtk_icon_set_render_icon_pixbuf   (GtkIconSet      *icon_set,
-                                                GtkStyleContext *context,
-                                                GtkIconSize      size);
-GDK_DEPRECATED_IN_3_10
-cairo_surface_t  *
-gtk_icon_set_render_icon_surface               (GtkIconSet      *icon_set,
-                                               GtkStyleContext *context,
-                                               GtkIconSize      size,
-                                               int              scale,
-                                               GdkWindow       *for_window);
-
 GDK_AVAILABLE_IN_ALL
 void        gtk_style_context_set_screen (GtkStyleContext *context,
                                           GdkScreen       *screen);
index 6b224363e50ba07d0aaaf8196b2bbe322a5543e0..abaea1f425d3ee7a403835a7a96b3897524a4794 100644 (file)
@@ -1,5 +1,4 @@
 * {
-  engine: none;
   gtk-key-bindings: none;
   icon-shadow: none;
 }
index 6d5cf345cd8dc0f0df1d610fc9b10fc651ca02a8..37d68efd4a2bc2f4d74e8d41da390adc8306a7ab 100644 (file)
@@ -1,3 +1,2 @@
 deprecated.css:2: error: GTK_CSS_PROVIDER_ERROR_DEPRECATED
 deprecated.css:3: error: GTK_CSS_PROVIDER_ERROR_DEPRECATED
-deprecated.css:4: error: GTK_CSS_PROVIDER_ERROR_DEPRECATED
index a49d4773816a9355748c8e3915e27fbb73e78f7a..e438f16de862924aea719621967f225da8a30ec1 100644 (file)
@@ -1,5 +1,4 @@
 * {
   -gtk-icon-shadow: none;
   -gtk-key-bindings: none;
-  engine: none;
 }
index 509c601b315395d7a0f558af84260215241ef014..a00998da3f765d372d3ecb10f0e953a25217fea1 100644 (file)
@@ -27,7 +27,6 @@
   border-top-width: inherit;
   box-shadow: inherit;
   color: inherit;
-  engine: inherit;
   font-family: inherit;
   font-size: inherit;
   font-stretch: inherit;
index 99adf8ded963256b09d849a83da76c786745c951..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1 +0,0 @@
-value-inherit.css:30: error: GTK_CSS_PROVIDER_ERROR_DEPRECATED
index 1bf604fdd0cbb5efaafb00f16df13bdfe705c497..349881c8a425fea49c36117632431726f0866e2b 100644 (file)
@@ -27,7 +27,6 @@
   border-top-width: initial;
   box-shadow: initial;
   color: initial;
-  engine: initial;
   font-family: initial;
   font-size: initial;
   font-style: initial;
index f1d23c5f48cfebb5a4fb29b9a5f455b5dadd4a55..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1 +0,0 @@
-value-initial.css:30: error: GTK_CSS_PROVIDER_ERROR_DEPRECATED
index ed15d6eb8a570134c7a911c0dbafbd68c2e10ed4..4446c9267ecd0fbb37f6f31fc768dafb89b3397e 100644 (file)
@@ -27,7 +27,6 @@
   border-top-width: none;
   box-shadow: none;
   color: none;
-  engine: none;
   font-family: none;
   font-size: none;
   font-style: none;
index e0663e49a59dac3b373fa70b1fa71a1c68355974..f3e07a37c8aeb1c645c8ac95351a538a37c18396 100644 (file)
@@ -18,7 +18,7 @@ value-none.css:24: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:25: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:27: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:29: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:30: error: GTK_CSS_PROVIDER_ERROR_DEPRECATED
+value-none.css:31: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:33: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
@@ -30,4 +30,3 @@ value-none.css:39: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:40: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:41: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
 value-none.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
-value-none.css:43: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
index e2a1578b9f82a6cac4f3b3749be004ec7734f153..80dbe1087ee99bc2d1754e1bf9aeb575134425fe 100644 (file)
@@ -7,7 +7,6 @@
   border-right-style: none;
   border-top-style: none;
   box-shadow: none;
-  engine: none;
   font-family: "none";
   text-shadow: none;
 }